Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 29 May 2010 09:39:12 +0000 (09:39 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 29 May 2010 09:39:12 +0000 (09:39 +0000)

Trivial merge